remove try/catch from getClassName(), modify wait methods