Add settings, expand on convention for complete_*, minor rewrite