adding extra debug info
adding referer check
Merge branch 'master' into bleeding
fixing dispatcher