Bugfixes. Hiding changes
Combat rule scoring. Misc changes