small bug fixes
Merge pull request #467 from JFreegman/master

small bug fixes for toxic