Fix incorrect message displayed when ending
Fix timeouts not resetting after going off