fix J bugs and some painter bugs