Last version

Many fixes