Fixed bugs and updated readme