removed & updated more stuff