minor improvments. addded coment on Keymantic