version update + bug fixes