huge helper overhall, cleaned up most all querries
Merge branch 'master' into pain_train
necessary
Merge pull request #37 from nullet/pain_train

Pain train