Fixed more HJ crap. Almost done. Will use these numbers for paper.