More work on editquiz