Various tweaks, fix noLogin option