fixed delay bug and cleaned get_collection