Question now has its own class, also many fixes;