Edited some scenes to remove bugs