polish and fixes