fixed bugs; switch definition source to Google