Clean up, fix rare position bug