Minor changes made while reviewing source for engine