Issues/sprint 9 tweaks

PR encompassing various smaller tweaks.