V1.x/develop - Simple cleanup and additional Jukebox functionality

If you prefer not to merge something into V1.x before V2.x drops I will just close this pull request again.