fixed hop usage and some deprecations