merge develop, again

sorry i broke it again this morning with some merges, if you can merge this one, i'll merge it into develop