misc changes
merging
Tweaking