add extra markers
Merge remote-tracking branch 'origin/master'
extra dummy markers, pointer and timing tweaks.