Fixed SARSA errors and removed some old comments.
Fixed merge conflict