Add a guard around setting relativenumber
Clean up some folding settings