Various bug fix, updated version number and little changes.