Added logging and some adjusstments as mentioned on the google pages.

Signed-off-by: Michel Verbraak <info@1st-setup.nl>