C99 and JS improved.