A couple of fixes and moved the positioning of the cue server-side for now until some prediction issues are resolved