Further improve `next` command

* Fixes incorrect loop `next`ing behaviour
* Includes fix for determining return address