Updated code and comments.
Changed map.
Deleted unneeded files.