Fixing more stuff!!!!!!!