Fixed bugs that i created