Fix CS and edit some configuration