Bug fixes and changes. Added roll count functionality.