completion and errors adjustement