Fix 15question and add and remove js for q 21 and 22