#100

Improvements
#100
#100

Preparing for regis edit