Cleanup, and bug-fix. --clone does not work with branches well