Fixed some Map Generation Stuff For new Draw Manager