fixed keypoints errors
pep8 fixes
Merge pull request #40 from Menerve/afw_fixes

AFW fixes