More tests, more documentation, more entity safety