Attempting to fix some mistakes on merge
Fixed clouds stuff and stuff