A lot of bugfixes + correct redirection to previeous locations