Fixed up with some final minor comments