tweak and rewrites

updated code for all drug scenarios using new drug model, adjusted some parameters for better fit