Tweaks
Minor fixes
Fix gui terms
Old tweaks