placement and fixes