Back-up and restore possible , plus minor bugfixes