For students entering college with very little or poor physics background, the transition into fast-paced calculus based physics courses at a large university can be demanding; this thesis documents tools used in a preparatory course which is intended to ease that transition by teaching fundamental skills and problem solving. Within the preparatory course, we implemented online mastery-style homework, introduced frequent testing with retakes, and applied a values affirmation intervention intended to quell stereotype threat. In the initial implementation of our mastery-style exercises, which were successful in two clinical trials, mastery was less successful in the course due to high levels of student frustration. Adjustments to the delivery and content with student affect in mind were able to mitigate frustration and increase students' productive behaviors and performance. On mastery activities which were particularly difficult or calculation-heavy, increasing the amount of scaffolding and breaking up content into smaller, more focused pieces were strategies that helped students master content. Frequent testing improved midterm scores, but the effects were diminishing with the number of tests. The values affirmation activity, which was given to the preparatory course and a more mature physics course, had little effect on students' performance despite its success documented elsewhere. Reflection on these tools' success has highlighted the importance of considering student affect and the sensitivity of their effectiveness to students' sense of agency and to the tools' specific implementation. [The dissertation citations contained here are published with the permission of ProQuest LLC. Further reproduction is prohibited without permission. Copies of dissertations may be obtained by Telephone (800) 1-800-521-0600. Web page: http://www.proquest.com.bibliotheek.ehb.be/en-US/products/dissertations/individuals.shtml.]