Tweaks and such

Don't merge this yet, got to write another manual