Fixed some broken imports (likelihoods has moved), remember to tell everyone to delete their pyc file
added ordering of methods