completion & parsing fixes