I think that all of these proposed modifications sound good - I'm excited to see what you come up with!
