minor fixes for calculated datasets, and fix axis stuff