Update to use C99 standards... Address compiler warnings (should compile without warnings now.