Throw Free mode and some final bug erradication