Fixed several logic issues

Fixes an infinite loop of questioning, adds improved diagram