More tweaks as well as Future re-write