Cleanup/ERC checks, etc (on my own, no video)