Numerous minor updates