General formatting and configurtion tweeking