Fixing and improvements