minor fixes, more keyname stuff, owner remove modular