Numerous updates, additions, corrections