Lots of fixes/formatting (NOT 2.5.0 YET)
Not this again <.<
Remind me to always sync, not push.