aliases, cleanup, misc