Added remaining entities. Cleaned up a bit.