Corrects singleton pattern in DBHelper, corrects hasData usage in EchoNest, some indentation and warning fixes