Bugfixes, corrected pin names, and small formatting changes