Minor fixes

@prujohn interested in hooking this package up to drone and adding some hop support?