components

moving inline queries to components; other nifty changes of niftiness