Small Updates

Values now updated - Still need to implement is visited (to reduce
failure rate)