Some more changes to answering questions