resolved some build and lazy paint issues