A few tweaks and a reset action