Sounds good, will make this and other changes mentioned