Almost done system.py

some minor tweaks to id_ and map_