bug fixes, logging add, ...