get rid of some unnecessary checking/waiting, to go faster