Second version

Small updates.