Removed a debug statement
Added instance searching and fixed class declarations