Documented Entity a bit more, cleaned it up a bit, and removed unused variables from some methods in it.