Merge pull request #1016 from LightAdept/master

New pokes and small fixes
New Arcnanine