small modifications && vim config