fix pass by reference errors. render overlapping annotations.
Merge remote-tracking branch 'origin/master'