fix walls and copy jake's scene to master