Good suggestions, will update shortly