added maps + fixes