Edited some more stuff