Remove incorrect drawing
Draw more often
Make more dynamic less magic numbers