Added Draw functionality, updated minor issues