added not found checks
switched to counts - things are kind of broken now
sync cleanup
don't cleanup at beginning