added three new classes to draw simulator
modified a few things