position/offset handling improvements
position/offset handling improvements