Minor changes and some deleted features

Added a fix on the output of s^w_nn (in), fixed canonical directed
model and deleted some unnecessary features.