a couple of fixes and changes