Fifth Commit

All basic query modules polished, to add advanced query modules and
maybe further polish the application.