Many improvements in 2.0!

Many improvements in 2.0!