Add fixes and improvements