fixes. lots of fixes.