Fixed many tidbits