typo fix, related to commit 9194872
minor improvements and binary fix