Dev

Some minor changes