Entry Tweaks and events changes