Edited a lot of stuff