#62 some fixes