cd78cc1 Actually commit some more cleanup and fixes I tested with.

Authored and Committed by kevin 8 years ago
    Actually commit some more cleanup and fixes I tested with.
    
        
file modified
+7 -3
file modified
+1 -1
file modified
+1 -1