So many fixes, formatting, and features I can't begin to enumerate