misc. cleanup, mainly configuration related. to be tested tomorrow