some bug fix and updated version