Contains features fixed while testing other branches

Just a few updates to features which I fixed up while testing other stuff. No changes to actual code.