Last tfs and fixes