debug messages
updated to new features