Update for EL7. ALso, fix a few bugs