Minor additions.  Changed naming conventions on a few items.