placement fixes and enhancements