Buncha fixes and failing tests.