Fix for Druid of the Claw (which would not bounce correctly)

Also some small formatting changes.