Fixed a bug and hirez'd the mousetrap