#6 some fixes
#6 some fixes