#20 some fixes