Made some small chages to tydie up the coners