Added config fix

Also class file shit..