some changes as flagged by NetBeans
Merge remote-tracking branch 'origin/master' into jplayer