minor fixes and updates