persist more data in the database to speed up user interface
fix some comments and typos