bugfixes, better branches, added .find