add missing lines, remove most formatting