added more questions, more cleanup, more fixes