Debugging for big n, minor changes done