cleaned up formatting, add and remove tees, todo: tees markup needs to be generalized (IDs gotta go)