DRC cleanup
Lots of improvements