Buncha fixes.
conflict