commit fixes on #28, #26, #22