Sort help alphabetically + various changes