Fixed up elite; some debugging of same