errors fixed (not all)