Small changes and tests playing with LONI data.

Issue #76 closed and working on #78 and #18