rvanek -- some little changes