some updates and fixes #9