some more small updates
little more work