multiple updates and fixes