tweaks to acitivty handling.