corrected queries, access and other enhancements