little refactoring, and message level changes
fixing conflicts