fixes after review and test