Made some changes to thesis from andys comments, some remain