More pull from home.asm
Attempt at fixing some errors and forgotten includes
Merge branch 'release/t08242014c'