Some minor changes, asking questions fails in some scenarios :(