Brought content generator to life, minor fixes and improvements