third

some fixes