More info & overall improvements