Articuno fixed, along with small changes.