No functional changes. Mark sections better so someone else can understand this. Add better doc string for after macro. Move some things into the correct sections.
Add lib/ to load path with the non-elpa packages.