modified several small problems