more minor adjustments in functionality