Preprocessing and a few corections