REMOVED ADS + minor fixes