include Craig's small fixes