removed some variables, remove header on fetcher,

close querys properly, better names for some variables