diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
index b6fcb57389..2d351dc2e7 100644
--- a/libmscore/chordrest.cpp
+++ b/libmscore/chordrest.cpp
@@ -893,7 +893,6 @@ Element* ChordRest::drop(const DropData& data)
             case Element::Type::FRET_DIAGRAM:
             case Element::Type::TREMOLOBAR:
             case Element::Type::SYMBOL:
-printf("drop %s\n", e->name());
                   e->setTrack(track());
                   e->setParent(segment());
                   score()->undoAddElement(e);
diff --git a/libmscore/tremolobar.cpp b/libmscore/tremolobar.cpp
index 4b2a7b8c08..959e405437 100644
--- a/libmscore/tremolobar.cpp
+++ b/libmscore/tremolobar.cpp
@@ -27,7 +27,7 @@ namespace Ms {
 TremoloBar::TremoloBar(Score* s)
    : Element(s)
       {
-      setFlag(ElementFlag::ON_STAFF, true);
+      setFlags(ElementFlag::MOVABLE | ElementFlag::SELECTABLE);
       }
 
 //---------------------------------------------------------
@@ -38,6 +38,7 @@ void TremoloBar::layout()
       {
       qreal _spatium = spatium();
 
+      setPos(0.0, 0.0);
       if (staff() && !staff()->isTabStaff()) {
             setbbox(QRectF());
             if (!parent()) {
@@ -92,7 +93,7 @@ void TremoloBar::draw(QPainter* painter) const
 
       int n    = _points.size();
 
-      int previousTime = _points[0].time;
+      int previousTime  = _points[0].time;
       int previousPitch = _points[0].pitch;
       /* we place the tremolo bars starting slightly before the
        *  notehead, and end it slightly after, drawing above the
@@ -101,8 +102,8 @@ void TremoloBar::draw(QPainter* painter) const
        *  timeFactor and pitchFactor below to reduce these values down
        *  consistently to values that make sense to draw with the
        *  Musescore scale. */
-      qreal timeFactor  = 10;  // * _userMag;
-      qreal pitchFactor = 25;  // * _userMag;
+      qreal timeFactor  = 10.0 / _userMag;
+      qreal pitchFactor = 25.0 / _userMag;
       for (int pt = 1; pt < n; ++pt) {
             painter->drawLine(QLineF(previousTime/timeFactor, -previousPitch/pitchFactor-_spatium*3,
                                      _points[pt].time/timeFactor, -_points[pt].pitch/pitchFactor-_spatium*3));
diff --git a/mscore/debugger/debugger.cpp b/mscore/debugger/debugger.cpp
index 31c3de2866..4e2d5d97e1 100644
--- a/mscore/debugger/debugger.cpp
+++ b/mscore/debugger/debugger.cpp
@@ -860,9 +860,7 @@ void SegmentView::setElement(Element* e)
       sb.spannerBack->clear();
       sb.annotations->clear();
       foreach(Element* sp, s->annotations()) {
-            QString s;
-            s.setNum(qptrdiff(sp), 16);
-            QListWidgetItem* item = new QListWidgetItem(s);
+            QListWidgetItem* item = new QListWidgetItem(QString("%1 %2").arg(qptrdiff(sp), 8, 16).arg(sp->name()));
             item->setData(Qt::UserRole, QVariant::fromValue<void*>((void*)sp));
             sb.annotations->addItem(item);
             }
diff --git a/mscore/dragdrop.cpp b/mscore/dragdrop.cpp
index a782709d88..44eaed3579 100644
--- a/mscore/dragdrop.cpp
+++ b/mscore/dragdrop.cpp
@@ -376,6 +376,7 @@ void ScoreView::dragMoveEvent(QDragMoveEvent* event)
                   case Element::Type::HARMONY:
                   case Element::Type::BAGPIPE_EMBELLISHMENT:
                   case Element::Type::AMBITUS:
+                  case Element::Type::TREMOLOBAR:
                         {
                         QList<Element*> el = elementsAt(pos);
                         bool found = false;
@@ -564,6 +565,7 @@ void ScoreView::dropEvent(QDropEvent* event)
                   case Element::Type::SLUR:
                   case Element::Type::BAGPIPE_EMBELLISHMENT:
                   case Element::Type::AMBITUS:
+                  case Element::Type::TREMOLOBAR:
                         {
                         Element* el = 0;
                         for (const Element* e : elementsAt(pos)) {