added gittins fix, fixed ucb
merge fix