Split config bits into own file .... / assorted clean ups