Basic changes and to dos