More updates to initial Suricat package.