Miscellaneous bugfixes, crit rate fix