More ignoring is healthy
Some minor fixes