minor fixes
about to change merging method