further fixed transitions to prevent stack overflow, completed roll base
stats
Merge branch 'dev'