Bunch Update with modal maps in tours, also some refactoring done. Hell Yeahgit add .!