Add langs and a few bug fixes