changes form patrick

some more changes from patrick