Bug fixes
Upped version