Fixed up remaining details