more questions added, some more functionality