Fixes as per AM comments
My not much tagging script