commit fixes on #20