Adds argument errors, removes excess debug output