WIP placing, tweaks