Added MagicTube-related objects to it's class instead of in MrRoboto, some variable renames