1.1...

some fixes...