New improvements mostly in answer generator