Added ignore, some misc. changes.