[WIP] Bugfix/usability issues