updated syntax; fixed some completions