some cleanup, add set question