all fixes done, missing some locations but that's it