Release 2.0.0b

Cleaned some stuff up