merging minor changes and scripts