Adds logging better messages, processing refinement