bug fixes, Stopint testing changes, some other shit