Some cleanup, and added some ignores