add logging + bug fixes
Merge from ekt branch