updated lots of things, also, worst commit message ever