more to universe data source
fix stop watch with test