fix few bugs and update version