refactored google header
made a lot of minors tweaks
fixing conflicts