Added diagonal drawing, other changes