Addressed TODO AH, minor other changes