[@FernStone]
Feel free to send me a PM with suggestions now but I won't be able to look at it tonight.