fixes, logging