Various polish and fixes