Changed connection string, some minor updates