positioning fixes/udpates