numerous misc fixes/changes