- Fixes and more fixes final way to go