Patch of fixes for bugs and oversights

I tried a few values, I was not happy with how it turned out. I will leave it until we're going to actually change hardcrit.