now: logging and adjustments in code organization.