Fixed boundary execution condition calculations; prettier callbacks