Free-keys, escape remapping, comment cleanup