fixing changes
Fixing more stuff