eol issues + minor formatting changes