Fixed database duplication bug. And worked over usability.