remove getCount(), more general fixups