Merge pull request #36 from nullet/pain_train

53rd president
huge helper overhall, cleaned up most all querries
Merge branch 'master' into pain_train
necessary