some minor errors:)