2.0.2

Finish upgrade.rb script and fixed a few more things