Cleanup, added saving of starred status.