Thanks, fixed some of that in 167e3d6246983b0909130207a121a9a4e6cc3881