Various changes :)