added Units and map generation