Thanks, those suggestions make sense and should be fairly easy to implement, I'll try and get those sorted soon
