WIP: minor computational issues