fixed up width/draw etc