started cleanup
removed song / musicvideo part
tidied up some functions
main loop cleanup
cleanup up utils
fixes
fixes