various minor fixes and updates