fix bunch of bugs
update version