c-mode + other improvements