alias fixes. in progress