change remaining time handling and messages
wip