more little modifs