Numerous improvements all over the place