Fixed drawmulti, added test for it, and cleared up some formatting