Hyperion - added Effect handling and small cleanup