general cleanup and fixed default host name back to localhost