Some Updates From Derek

Derek's Updates #1 (yes, I'm actually doing this)