All mistakes fixed