Multiple fixes, reworked find()