port flynn run, make a few corrections elsewhere

Signed-off-by: Blaž Hrastnik <blaz.hrast@gmail.com>