Switched calculations to effective HP, updated some values