Some alignment and improvements