minor changes, cleaning up comments and javadocs for new class names like SecurityAttributes and CapcoSecurityAttributes