Mostly working with possible render offset issue
fix bug