Added castle evaluations, code tidy up, eval fixes

Following most of the snap framework coding style recommendations.