added aliases, removed junk