11

Some minor changes