Fix last issues with viz. Ready to merge with newperiod