improvements, added current character under cursor