more stuff
some changes