pretty much done with fixes for mini sprint