Merge some of the more boring things from pst into the main
Fix error merging follow button toggler
Merge a load of functions from the main into pst, as well as some fixes, to fast forward it a bit