* temp * temp * before cleaning up * cleanup merge * fix warnings * merge fix * clang format
* temp * decompile joints * fix merge