Adding the simple features
Automatic drag detection

Other fixes and simplifications