Add Google Mas, fix list issues