Added ignore, fixed a couple other things