Small fixes plus saving works.