Added a ceiling
Fixed merge conflicts