Small improvements. Solve part of #27