refactored bin finder and bug fixes for 2.2 / 2.3