Feedback from robbie

A few small changes to make integration into the app easier.
More details in the commit messages.