fixed doubles and added more questions