added/fixed aliases