Fixed minor issues and added backup functionality