a few aliases and small changes