Latest and greatest

Fixed up some details