Many fixes and updates