Started on explore system, minor bugfix