some fixes
merging