This patch fixes some spelling errors and adds some BUG_ON() calls so we
can make sure that all this new code is working properly.