Fri Mar 29 10:51:44 MDT 2013 - Cleaned up a few things