bunch of changes that i forgot about ;(