changes made some bugs fixed locally