Various improvements all over