finished tabris
fixed remaining issues