Paint and speed improvements