Updated usage notes and comments