bug fix and bump to version 2.0 beta with unlock unfinished