Add new lang and fix few issues