Fixed errors. Maybe.
merged