Small additions.

Some additions and improvements.