some updates, removed serverlocation from some files