Updated annotations
Minor updates to a couple of scripts