Looks good! 
I'll take a look at it / write up a CS, on Monday :)