hints + other changes