Minor and very useful updates from heathmatlock and neo