tabs and other changes