Bug fixes and move to using Linguist repo