Fixed bug with redirection in question without answers
Cleanup of code
Fixed conflicts