fixes after timtait comments