fixed stuff up for live