some changes

some changes by magnusvmt