Map Generation Update

Fixed some object oriented issues.