made some minor adjustements