Nexxus2

This should fix the PK scorination bug. If it doesn't, I will create new branch. For now, it is feature complete.