Small fixes, clearer separation of questions