fixed isParton
cleaned up a bit