[Caryatis]

Hopefully the final update needed. Added a few more fields and did some reorganizing so it should be more readable in all situations.

Also we worked the needed effects so everything should be counted correctly now in the display.