some fixes and added g-analytics