work on bug fixes
merging