Tweaks

Just a few small tweaks for user-friendliness.