Added more sanechecks