tidy up and shaders are working