Various small fixes and enhancements #814

Closed
Oneric wants to merge 0 commits from Oneric/akkoma:varfixes into develop

These branches are equal.