Update prepare_fork to be more inline with original prepare script
Improve comments and git flow