Text + correction of bugs