Edited bunch of stuff