Updates and fixes
changes