adding alias and misc changes