some minor adjusts