add ga-id and small updates