Made mostly small fixes