Adding more updates to drawing the course
fixing merge conflicts