last second revision of a couple tiny details