WIP lot of ASM to C++ (443 left)
Cleaned up lot of code