cleaned header files; disabled empty timestamps; geometries redesign