more additions and reorganizations, added references