remove old lib
fix typo
refactored (again)