javadocs + public methods @Nullable contracts
minor fixes
@overrides in activator
minor fixes