Possible to add entries and lots of bug fixes