Various Imrprovments