Headache and nausea calmed down a bit, a bit of code clean-up and a few changes to the tools