some minor adjustements