Fix newline formatting, fix possible bug with arguments