work in progress --> logging added + minor issue fixes.
(note - there are still issues)