Several Bug Fixes, Added Poison