Lots of updates thanks to client project

Good things come to those who stay late coding.