2.1.18 beta

Some minor changes