Added to and fixed