fixed up rendering and loading bugs
Merge branch 'walport-water' into testing