fixes and updated