PKHG updates to use Vectors, some cleanup done