corrects a couple of errors in previous commit, deals with loader removal if view is unloaded before loading has completed, deals with case of tour loading error