fixed some live issues