added drop constraints functionality, +several bug fixex