Updates to the addEntry and some other tweaks.