Paint.JAVA -> Spade
minor fixes