Zipline update plus some crap