combat module; minor ui refinements