In progress

Some minor changes