added new messages
refactored live editing code