Small fixes all over the place
Merge branch 'dev-gui' of github.com:Farenheight/Lidkoping-SH into dev-gui