Persistent area almost completed, minor fixes are OK