Fixing various bugs
Autocommit Wed Dec 10 08:33:51 EST 2014