Paint and other updates