updating with my latest changes including new git aliases