minor fix and start to work on #53