95%

2 fixes and complete