some more little changes. still not done.