Address issues #5 #6 #10 and language updates