made a bunch of fixes. in progress