lotsa new aliases + fixes