Fixed CMAKE, added some measurements