Cleaned up a bit and setting server-url now in config.js