worked some fixes