formatting, spelling, excaping
fixed merge issues