Improvements on entry (not done), Persistence is almost there, but not exactly.