Minor changes

Almost final version