minor changes and lang