Some refactoring of Entity.cs, along with some more commenting