Various updates. Couple line-ending fixes