a few changes
some more
new aliases