lang support, bug fixes