Fixes for the stuff that was wrong in original submission

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>