minor bugfixes and extensions
making things more modular
moving towards cacheable queries
minor bugfix