fix two major thinkos