merge some older dev stuff into main, some janky hotfixes for stuff thats already been or beind done in dev.