relocated magic and discovery service stuff
fixed typo