removed bogus correct, some clean ups