Imported missing answers, minor fixes