fixed comment characters and added remappings