Fixed some attack speed calculations

fixes #133