minor bugfixes and removed findBy methods