Minor changes and new ignore rules.