added draw functions and a minor cosmetic changes to the classes API