fix some screwups and formatting, restore find-functions