Basic support for moving around an @
Logging tweaks.