more cleanup, draw system.