New painters added and some other fixes.