Getting closer still, fixed one huge ream of errors.

Signed-off-by: David Silver <dms.silver@gmail.com>