Add hjkkl movement + fixing some bugs