rAKA/bugfixes%2Fall_bugs_found_by_working_on_tutorials

master