Some JavaDoc and remove non-fluent assertions
More JavaDoc