Removed unneeded code, added random map selection, & more