better completion and expansion settings