some more adjustements