fixed some hatch bugs