some minor fixes, need to find out what's wrong with the aliases