Economy fixes, zipline incorporation