added game map handling, other improvements