update from marbindrakon/eve-wspace