fix re-start
fix all messaging?