Cleaned some extra things, still looking at centering draw count.