Able to draw objects in different modes; fix few minor bugs