Multiple fixes, now 2 types of questions