Cleanup

resolves issues #5 #6 and #7 
"queried", right?