Fix language and some cleanup