Changes for webkit and Some tweaks