Fix interaciton with ctrl+k
Added completion support