Some updates and fixes