Listing modules alphabetically and some minor fixes

See commits.