Replacing prepare script to close #21
More minor updates