Fixing sumatra p/; stuff, adding function/library.