removed organictabs support; general changes/fixes