Various improvement