Fixed silly mistake in bash script execute command.
Minor changes.
Fixed merge conflicts.