Fixed up errors
merged