Fix a bug causing lots of calls to next to be running simultaneously, fix points not being floored