Onetab

batch of changes for seanl and Jason Bell