minor clean and fixes