1. udpates and fixes