minor errors fixed 2 remaining