clean up and fixes. No biggie.