cleaned some more references, starting to do the main hsfs chapter now