#163 Added missing newlines and such