few cleanups and changes
gem lock added
merge changes