More bug fixes and Antithrombotics

Attached a bunch of the changes I've made for the couple of bug fixes we
talked about.