Added goal state check and equals for state, also strips action