added functions, update git aliases