some more changes; not quite sure if they will do the trick, but they will not cause any harm... i think ;)