updated more bugs