reset added and more little fixes