Fix merge conflicts
Impressions working
Javascript debugging
More javascript debugging