Questions imported, Martin's suggestions implemented