Few tidbits fixed up