Now whip attacks take away [strike]60[/strike] 50 energy from you. Also added in a shopkeeper in Act 1, the first level.