improve few code comments, plus fixes #49 and closes #46