fixed all problems listed on ujoiner, accidentally did Maxs but hopefully that is chill, I fixed some other bugs and added a bit of functionality while I was at it, definitely pull from develop