Fix more things
more edits