merging some fixing