10jan2014

working on bugs