Fix comments, add abstract flag to a type to sync up with Java. Rev version to 2.1.