More work: return types, unique methods, small cleanups