added more aliases, formatting fix