Fixes #96

Also fixes bogus malformed hp bug