Fixed a couple of thinggies
test
trying to merge