some additional finder methods (need to be tested) and bugfixes