Waited until paints before program starts

Other minor changes