just some changes, nothing serious
some moving of the code