several patched + new classes not working yet