fixed issue with pswatch, it assumed old tail behaviour
fixed more problems with legacy fhi scripts