minor edits, aliases