Document some methods in Entities
More Java 7 compatibility
Added in a bunch of Component types from another project