Added VMWare Advisory IDs + some tidying up.