Fixed HPF, readded Comparable implementation