Numerous small changes