87ccd1e some more minor fixes and updates