clean up the code, added more functionality to update and less to draw.