fixed aliases error
more improvements of the aliases