improvements to Paint.java