Made some small changes to entities, need more work on parser done before continuation.