bug fixes and furthered assertion and query capabilities