Last fixes and udpates