C code revamping and some other things.