final updates and fixes