updating for current branch - changes in command line interface and paths, mostly