Ui for entities, and lots of bug fixes.