10/11/2013 00:55 Repair and clean up some code