lots of minor changes
Merge pull request #296 from smogon/b6cedd14380fe6521d622e718a9a06cb

lots of minor changes