Typos n stuff
Merge branch 'master' into feature/loops_in_loops