#8 some fixes