Fixed syntax problems and removed old packages.
More login tweaks.