improved delay handling, slight db modifications