[@Mae], [@Melo]

Okay, there was a lot in your post but I've updated my sheet with what I think is all the required changes. Let me know what you think when you get a chance to look at it!