Make improvements all over