more alias updates
more updates
more fixes