More docs, some i/f clean up