discovery, port simplifying, lights fixes