Fixed some stuff (testing ability to commit with dwatkins@valpineware.com)