#54 some fixes