Language fixes
merged alan changes
forgot master