added condition types, edited textbook