Added aliases, corrected some errors