error corrections, still no tests
error corrections

Built with netbeans 7.4