Updates and fixes and simplifications