Minor modifications, path bug corrected, main function order modifications.
Merge branch 'experimental' of https://github.com/macheretj/slp into experimental