Clarify some things and add Complete to clean up