placement fixes, some mods