Better drawing methods and fix for normal error in wedge.