still trying to figure out hp bug; various other fixes