Added testing, local and host configuration.  Other improvements added as well.