updated logging messages
merged commits