made some changes

still needs poison and such to work correctly.