Some bug fixes
blah
Robert's Push 10-2