bug fixing and new map option fixes
finished extras