fixed callback issues; added missing $files elements; removed camelCase