Add s.el to required packages, other small changes.