Added missing files + drag bug fix