Adds BAsic Class support, fixed Null Reference in combat window