methods and types to owners
misc cleanup