Minls fix. other testing/output fixes