Ignored some files; Other lingering changes