some refactoring, update documentation and strcutured query work in
progress