lots of fixes, still doesn't pass all tests

Something wrong in proposal