Corrected comments after last commit.
Cleaned up thing I don't use anymore or which were made available in Emacs since then.