Your buildings you drew look good! I went ahead and changed them to building=yes and removed the amenity=school. Also, personal information in changeset comments isn't necessary, but that's a personal privacy choice.