Fixed up some details