Fixed faulty queryHelper method
Added draw method for debugging
Added isEmpty() + cleanUp() methods
Removed obsolete methods