fix some formatting, add language defaults