Tweaking the rewritten bits

nothing is 100% yet.