namespace, hide restore.point & bugfixes