Made 11 improvements