Removed clang warnings, added more stuff n' things to the C version