cleaned up packages.el and minor edits