Minor fixes and add on's.