General adjusts and improvements